Move things around, simplify, get rid of ruby artefacts