Adding some cleanup