cleaned up routes naming and calls