code tidying
code tidying