made code clearer in routes and form