Source code cleanup
Bumped package version