Weffc++ changes