Tidy ups, speed ups