Continued clean up of code smells