Cleanup, added documentation for utility methods
Converted tabs to space