Addressed all PR comments by @marmbrus

https://github.com/apache/spark/pull/285