Finished -Weffc++ cleanup