Refactor requires to be like Sinatra