clean up

cleaned up indents and properly annotated files.