Addressing review comments and updating formatting