basic clean up applied