Completed refactoring the buoy, marker and validation gate tasks.