Clean up code & make work with latest sinatra/sinatra-authentication
versions