reorganised, removed rubbish