Some tidying shit