Version change and minor cleanup