formatting and applied suggestions based on Mike's suggestions