Update version number
Code cleanup