More refactoring, optimisation - cleaning up 'assets' and 'sections' methods a little