diff --git a/commands/server.go b/commands/server.go
index b1611233c..5f31fcfd1 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -43,7 +43,7 @@ var disableLiveReload bool
 var serverCmd = &cobra.Command{
 	Use:   "server",
 	Short: "A high performance webserver",
-	Long: `Hugo provides it's own webserver which builds and serves the site.
+	Long: `Hugo provides its own webserver which builds and serves the site.
 While hugo server is high performance, it is a webserver with limited options.
 Many run it in production, but the standard behavior is for people to use it in development
 and use a more full featured server such as Nginx or Caddy.
diff --git a/commands/undraft.go b/commands/undraft.go
index 36184060c..4cfdfbc11 100644
--- a/commands/undraft.go
+++ b/commands/undraft.go
@@ -78,7 +78,7 @@ func Undraft(cmd *cobra.Command, args []string) {
 	return
 }
 
-// undraftContent: if the content is a draft, change it's draft status to
+// undraftContent: if the content is a draft, change its draft status to
 // 'false' and set the date to time.Now(). If the draft status is already
 // 'false', don't do anything.
 func undraftContent(p parser.Page) (bytes.Buffer, error) {
diff --git a/hugolib/shortcodeparser.go b/hugolib/shortcodeparser.go
index 2efebbe4b..bef8ed84f 100644
--- a/hugolib/shortcodeparser.go
+++ b/hugolib/shortcodeparser.go
@@ -164,7 +164,7 @@ type pagelexer struct {
 	currLeftDelimItem  itemType
 	currRightDelimItem itemType
 	currShortcodeName  string          // is only set when a shortcode is in opened state
-	closingState       int             // > 0 = on it's way to be closed
+	closingState       int             // > 0 = on its way to be closed
 	elementStepNum     int             // step number in element
 	paramElements      int             // number of elements (name + value = 2) found first
 	openShortcodes     map[string]bool // set of shortcodes in open state
diff --git a/tpl/template.go b/tpl/template.go
index 97a043441..00617ff10 100644
--- a/tpl/template.go
+++ b/tpl/template.go
@@ -66,14 +66,14 @@ func T() Template {
 	return tmpl
 }
 
-// Resets the internal template state to it's initial state
+// InitializeT resets the internal template state to its initial state
 func InitializeT() Template {
 	tmpl = New()
 	return tmpl
 }
 
-// Return a new Hugo Template System
-// With all the additional features, templates & functions
+// New returns a new Hugo Template System
+// with all the additional features, templates & functions
 func New() Template {
 	var templates = &GoHTMLTemplate{
 		Template: *template.New(""),