ESF-381 - Tidying up