small source style refactoring, limit lines length to 79 chars + misc ToDos