cleaning

more cleaning up