Clean up code
Clean up space replacing