Comments and cleanup
clearer output