How to improve this?