Update version
Clean code