Cleaning up a bit
More cleanup