Fixed versioning
Code cleanup