Fixed things Trevor commented about on pull request