*Refactoring/minor changes