cleanup private/public methods