First small refactoring

Cleaning up commented code, source formatted