documentation tweaks & code cleanup
code cleanup step 2
code cleanup / documentation