Reorganized a few things to improve readability.