tidies code even more