add helper methods, clean up routes