Update spacing
Move directive-level variables out of scope
Remove unused settings
Remove unused css