Code refactoring done!