more refactoring, layout adjustments, style tweakage, etc