tidyed up things