Cleaning up a little!