diff --git a/SFDashC/errors.go b/SFDashC/errors.go
index 4b3aef0..1088f4e 100644
--- a/SFDashC/errors.go
+++ b/SFDashC/errors.go
@@ -34,13 +34,13 @@ func NewFormatedError(format string, a ...interface{}) error {
 
 // NewTypeNotFoundError returns an error for a TOCEntry with an unknown type
 func NewTypeNotFoundError(entry TOCEntry) error {
-	return NewFormatedError("Type not found : %s %s", entry.Text, entry.ID)
+	return NewFormatedError("Type not found: %s %s", entry.Text, entry.ID)
 }
 
 // ExitIfError is a helper function for terminating if an error is not nil
 func ExitIfError(err error) {
 	if err != nil {
-		fmt.Println("ERROR :", err)
+		fmt.Println("ERROR: ", err)
 		os.Exit(1)
 	}
 }
@@ -48,6 +48,6 @@ func ExitIfError(err error) {
 // WarnIfError is a helper function for terminating if an error is not nil
 func WarnIfError(err error) {
 	if err != nil && shouldWarn {
-		fmt.Println("WARNING :", err)
+		fmt.Println("WARNING: ", err)
 	}
 }
diff --git a/SFDashC/main.go b/SFDashC/main.go
index 5e043ce..5a6eb6b 100644
--- a/SFDashC/main.go
+++ b/SFDashC/main.go
@@ -42,16 +42,12 @@ func parseFlags() (locale string, deliverables []string, silent bool) {
 func getTOC(locale string, deliverable string) (toc *AtlasTOC, err error) {
 	var tocURL = fmt.Sprintf("https://developer.salesforce.com/docs/get_document/atlas.%s.%s.meta", locale, deliverable)
 	resp, err := http.Get(tocURL)
-	if err != nil {
-		return
-	}
+	ExitIfError(err)
 
 	// Read the downloaded JSON
 	defer resp.Body.Close()
 	contents, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return
-	}
+	ExitIfError(err)
 
 	// Load into Struct
 	toc = new(AtlasTOC)
@@ -64,7 +60,7 @@ func verifyVersion(toc *AtlasTOC) error {
 	currentVersion := toc.Version.DocVersion
 	topVersion := toc.AvailableVersions[0].DocVersion
 	if currentVersion != topVersion {
-		return NewFormatedError("verifyVersion : retrieved version is not the latest. Found %s, latest is %s", currentVersion, topVersion)
+		return NewFormatedError("verifyVersion: retrieved version is not the latest. Found %s, latest is %s", currentVersion, topVersion)
 	}
 	return nil
 }