Code and comments clean-up