Fixed: code refactoring