fixes (Code Conventions)