Add override annotation, add comment