Refactoring and fixing minor defects on application form