continued updated for formatting and nit fixes