re-organisation of code