Switch indentation to spaces, clean up.