Tidying up a few methods based on feedback