Moved from Sinatra to Middleman, +some code cleanup.