More tidying
Remove print statements