tidying
some blocks