Refactor: standards are still important