Refactoring code - production release