Ghost code refactored
Ghost code refactored