Added methods to get distance and angle to the target and began cleaning up code, including some renaming and minor restructuring.