pretty-fy code, some onend stuff
merge