Add some comments. Reindent some files