Neater code