refactored parts of the code
bumped patch version