some tidying
first import