stylistic improvments and behaviour