Fixed syntax inconsistencies with the rest of the codebase