Some tidying + more laziness