Put important info first
Replace more stubs with doubles