Doing some cleanup
Merge branch 'master' of https://github.com/wordium/i290P2
Doing some code cleanup and style fixes.