cleaned up routing some