Refactored - minor