Refactor. Clean up some sloppy stuff.