Working On Cleaning things up