Comments and clean up - David