Removed unnecessary rewrite rules
Formatting
Refactored to fix padding