fixing, tidying