Small cleanup:
- removed comments
- better Java7 style exception handling
- added TODOs for refactoring