Refactor application.normalize