Revert "try to separate function in definition"

This reverts commit 8419859af799cd45603bd25560b7f199deb1452d.