consistent comments
cleanup