Tidying up and adding usage message