clean up of lazy mistakes