indentation/organization tweaks