Final cleanup for consistency with SuitCSS prinicples