* : Fixups for readability and consistency