made the structure of the application a little nicer