Code and comments cleanup