and all cleaned up