Completing issues
Issue URI #1: clean routing code