revamp, sinatra clean again