Tidying up Flair because Travis is awesome