Markup improved
Rack version updated and code refactored