Reorganisation of client-side functions