Cleanup

+ Made code convention uniform.
+ Moved repeated constants into header file.