style changes, comments