Refactoring performed

Code was refactored. This commit updates full project with its settings