Code cleanup
Bumped version number