Code cleanup
version Bump