Cleanup - various things more explicit