Couple of formatting and style tweaks
Got modular route definitions working