Removes minor typo and minor changes for style

Closes #389 and #388