Code cleanup
Bumped version