Dash 2.1 #1 - More Indent Fixes + Cleanup