Cosmetic changes
Removing commented code
Code cleanup
Fixing Indentation
Added test style to styleguide