[master] tidying