Code Style: Fixing inconsistencies