even more cleaned-up