Removed some spacing
Fixed bug with routing
Code reformat