cleaned up routing, removed redundant code and added a new acceptance test