Misc changes, rephrases, nicer code