style updates and code formatting cleanup