tidying
minor reconstruction