Cleaning up this bit