Slight refactoring, more routing logic