Cleaning up things a little bit