styling and code review changes