Version bump
Clean up code