Bump version, cleanup and code improvements