Commit changes. Refactoring mostly
Commit changes. Refactoring mostly