Changed coding style to reflect my current personal taste. Since this code lives in the public realm, I want it to be somewhat presentable XD