closes #15 and reindent some files.