Cleanup and shuffle.

A lot of comment rot. This was really hacky code ;)