Adhering to code standards pt 2