Scaffolding for Finding and some minor formatting