Normalize the codebase to respect conventions