Formatting changes for readablitiy, updated a couple comments