cleaned up code and customized routes