Tidying up Reset and Clear methods