Polishing

Various little cleanups here and there.