Simplify everything

Go with something simpler :grin: