GH-64: Eric Mason's patch, whitespace cleaned up