Release version
Code clean up & refactoring
Fixes of small defects