Refactor gamens

Made changes to fix #39