Cleans up, bumps version