* Code refactored