source code and comments cleanup