minor, code cleanup and formatting