Some code refactoring has been applied