diff --git a/check_dir.c b/check_dir.c
index ccf94ab..6aeef7c 100644
--- a/check_dir.c
+++ b/check_dir.c
@@ -129,10 +129,10 @@ mkdir_p(char *path, mode_t omode)
 {
 	struct stat sb;
 	mode_t		numask,
-	oumask;
+	         oumask;
 	int			first,
-	last,
-	retval;
+	        last,
+	        retval;
 	char	   *p;
 
 	p = path;
diff --git a/dbutils.h b/dbutils.h
index 7eb68ed..9b41f2c 100644
--- a/dbutils.h
+++ b/dbutils.h
@@ -27,7 +27,7 @@ PGconn *establishDBConnectionByParams(const char *keywords[],
 bool	is_standby(PGconn *conn);
 char   *pg_version(PGconn *conn, char* major_version);
 bool	guc_setted(PGconn *conn, const char *parameter, const char *op,
-                const char *value);
+                   const char *value);
 const char	 *get_cluster_size(PGconn *conn);
 PGconn *getMasterConnection(PGconn *standby_conn, int id, char *cluster,
                             int *master_id, char *master_conninfo_out);
diff --git a/repmgr.c b/repmgr.c
index 91434f7..5c7cc86 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -49,7 +49,7 @@
 static void help(const char *progname);
 static bool create_recovery_file(const char *data_dir, char *master_conninfo);
 static int	copy_remote_files(char *host, char *remote_user, char *remote_path,
-                             char *local_path, bool is_directory);
+                              char *local_path, bool is_directory);
 static bool check_parameters_for_action(const int action);
 
 static void do_master_register(void);
@@ -1379,8 +1379,8 @@ create_recovery_file(const char *data_dir, char *master_conninfo)
 		return false;
 	}
 
-	maxlen_snprintf(line, "primary_conninfo = 'host=%s port=%s'\n", runtime_options.host, 
-																	(runtime_options.masterport[0]) ? runtime_options.masterport : "5432");
+	maxlen_snprintf(line, "primary_conninfo = 'host=%s port=%s'\n", runtime_options.host,
+	                (runtime_options.masterport[0]) ? runtime_options.masterport : "5432");
 
 	/*
 	 * Template a password into the connection string in recovery.conf
@@ -1400,8 +1400,8 @@ create_recovery_file(const char *data_dir, char *master_conninfo)
 		{
 			maxlen_snprintf(line,
 			                "primary_conninfo = 'host=%s port=%s password=%s'\n",
-			                runtime_options.host, 
-							(runtime_options.masterport[0]) ? runtime_options.masterport : "5432",
+			                runtime_options.host,
+			                (runtime_options.masterport[0]) ? runtime_options.masterport : "5432",
 			                password);
 		}
 		else