Comments and some cleanup