Stylistic consistency changes

My code still doesn't look like Henry's but at least all the function names are more or less the same.