I wonder if something could improve this