minor, neater code