Fixed bug in route setup. Removed comments