incoroporating code style changes