Increment version
Code cleanup