Improve version
Code cleanup