tidying things for develop branch