Doing: wrap functions into class; improve class function structures