Gem package, simplify + conventions