more cleanup/organisation