Is there a way to improve this?