[fix] grouping of functions