A few last changes to clean up the code before moving onto to leveling up for HTTP verbz