Refactor methods in route class