Moving fn to own package, removing log util