small formating improvements
added print method
more tidying up