Drone controller refactored