Fix various style issues following feedback