small cleanup and style changes