clear up codebase for consistency