diff --git a/conf/lex.go b/conf/lex.go
index 294d4895..5c9905bb 100644
--- a/conf/lex.go
+++ b/conf/lex.go
@@ -1,6 +1,7 @@
 // Copyright 2013 Apcera Inc. All rights reserved.
 
-// Customized heavily from https://github.com/BurntSushi/toml/blob/master/lex.go, which is based on
+// Customized heavily from
+// https://github.com/BurntSushi/toml/blob/master/lex.go, which is based on
 // Rob Pike's talk: http://cuddle.googlecode.com/hg/talk/lex.html
 
 // The format supported is less restrictive than today's formats.
@@ -393,7 +394,8 @@ func lexArrayEnd(lx *lexer) stateFn {
 	return lx.pop()
 }
 
-// lexMapKeyStart consumes a key name up until the first non-whitespace character.
+// lexMapKeyStart consumes a key name up until the first non-whitespace
+// character.
 // lexMapKeyStart will ignore whitespace.
 func lexMapKeyStart(lx *lexer) stateFn {
 	r := lx.peek()
diff --git a/conf/parse.go b/conf/parse.go
index 7711839d..885d66d3 100644
--- a/conf/parse.go
+++ b/conf/parse.go
@@ -5,7 +5,7 @@
 // Arrays and nested Maps are also supported.
 
 // The format supported is less restrictive than today's formats.
-// Supports mixed Arrays [], nexted Maps {}, multiple comment types (# and //)
+// Supports mixed Arrays [], nested Maps {}, multiple comment types (# and //)
 // Also supports key value assigments using '=' or ':' or whiteSpace()
 //   e.g. foo = 2, foo : 2, foo 2
 // maps can be assigned with no key separator as well
@@ -147,7 +147,8 @@ func (p *parser) processItem(it item) error {
 	case itemDatetime:
 		dt, err := time.Parse("2006-01-02T15:04:05Z", it.val)
 		if err != nil {
-			return fmt.Errorf("Expected Zulu formatted DateTime, but got '%s'.", it.val)
+			return fmt.Errorf(
+				"Expected Zulu formatted DateTime, but got '%s'.", it.val)
 		}
 		p.setValue(dt)
 	case itemArrayStart: