tidyed up a little