tidy up and points system