Visual Cleanup and standardization