A little cleaning up here and there