Move classes around for better readability.