Added circles on plotting points & reorganised as functions