Cleaning up and changing namespace