Tidied up the waypoint class