cleaning up code style to conform to guidlines

(stuff like how function values are written, etc. it's cleaner this way,
trust me.)