some more clean up and polishing