Refactor: Coding Standards