Cleanup and comment for final pull request