properly return module table from init
make function definitions uniform