Code refactoring prior to release