Adjust: comments, unused lines, empty line-breaks

Cleaner and nicer