adjusts: refactoring - added a few improvements