Style improvements thanks to jmink