Update comments and cleanup.