Bunch of cleanup and prettification