Removing clutter
Tidying up for public