diff --git a/cmd/backive/main.go b/cmd/backive/main.go
index e7e993a..818cc31 100644
--- a/cmd/backive/main.go
+++ b/cmd/backive/main.go
@@ -34,12 +34,12 @@ func defaultCallback(envMap map[string]string) {
 	if action, ok := envMap["ACTION"]; ok && action == "add" {
 		var dev *backive.Device
 		var uuid string
-		if fs_uuid, ok := envMap["ID_FS_UUID"]; !ok {
+		fsUUID, ok := envMap["ID_FS_UUID"]
+		if !ok {
 			log.Println("ID_FS_UUID not available ?!")
 			return
-		} else {
-			uuid = fs_uuid
 		}
+		uuid = fsUUID
 		log.Println("Device connected.")
 		var uuidFound bool
 		// Check the devices if the UUID is in the config
@@ -88,39 +88,39 @@ func defaultCallback(envMap map[string]string) {
 
 func main() {
 	setupLogging()
-	signal_chan := make(chan os.Signal, 1)
-	signal.Notify(signal_chan,
+	signalChan := make(chan os.Signal, 1)
+	signal.Notify(signalChan,
 		syscall.SIGHUP,
 		syscall.SIGINT,
 		syscall.SIGTERM,
 		syscall.SIGQUIT,
 	)
-	exit_chan := make(chan int)
+	exitChan := make(chan int)
 	go func() {
 		for {
-			s := <-signal_chan
+			s := <-signalChan
 			switch s {
 			case syscall.SIGHUP:
 				log.Println("hungup")
 			case syscall.SIGINT:
 				log.Println("Ctrl+C, quitting.")
-				exit_chan <- 0
+				exitChan <- 0
 			case syscall.SIGTERM:
 				log.Println("Terminating.")
-				exit_chan <- 0
+				exitChan <- 0
 			case syscall.SIGQUIT:
 				log.Println("Quitting")
-				exit_chan <- 0
+				exitChan <- 0
 			default:
 				log.Println("Unknown signal.")
-				exit_chan <- 1
+				exitChan <- 1
 			}
 		}
 	}()
 	go func() {
 		// exit function only does something when the exit_chan has an item
 		// cleaning up stuff
-		code := <-exit_chan
+		code := <-exitChan
 		database.Save()
 		log.Printf("Received exit code (%d), shutting down.", code)
 		os.Exit(code)
diff --git a/cmd/backive_udev/main.go b/cmd/backive_udev/main.go
index a0e45cd..f162ad6 100644
--- a/cmd/backive_udev/main.go
+++ b/cmd/backive_udev/main.go
@@ -11,14 +11,14 @@ import (
 
 // main Simple main function for the udev callback executable, registered with the udev service.
 func main() {
-	udev_logdir := "/var/log/backive"
-	udev_logname := "/var/log/backive/udev.log"
-	if _, err := os.Stat(udev_logdir); err == nil {
+	udevLogdir := "/var/log/backive"
+	udevLogname := "/var/log/backive/udev.log"
+	if _, err := os.Stat(udevLogdir); err == nil {
 		//ignore
 	} else if os.IsNotExist(err) {
-		os.MkdirAll(udev_logdir, 0755)
+		os.MkdirAll(udevLogdir, 0755)
 	}
-	f, err := os.OpenFile(udev_logname, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0666)
+	f, err := os.OpenFile(udevLogname, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0666)
 	if err != nil {
 		fmt.Println("Error creating logfile!")
 		panic("no logfile no info")