Tidying and adding storage