Code cleanup
Version Bump