Minor cleaning up