Moved DATA_MODE & METHOD object to class, more comments