general revision of code