Style tidying, mostly
Gem built