Refactor application
Add coding conventions