code standards and comments cleanup