looks better, final tidy next