[Refactor] - minor refactoring and improvements