code cleanup v1

comments galore