Completed refactoring the buoy, marker and validation gate tasks.

What were u trying to do here? I didnt get it