Cleaning up poor spacing