is there an approach to clean this up?