Adhering to code standards pt 3 and hopefully the last of this