Addressing comments, minor stylistic changes