clean up and comment chapter component