Re-style code per Dan's suggestions