Import, comment, and format cleanup per code review