Minor code and comments cleanup