Whitespace cleanup
Removed some icky implicits that weren't i18n-friendly