Clean up routing file and add specs