formatting updates and minor cleanup