#173 Code review updates and some formatting changes