more comment and formatting code