more clean up and making things cleaner