Cleaned intendation and other stuff