Address review comments; remove boilerplate