I believe this looks completely a-ok, but would really appreciate if @seph can take a look again!