tyding up a bit