Code refactoring
Small fixes
Release commit