clean up
general clean, comment and tighten up