version bump
code cleanup