Some comments and cleanup.