diff --git a/src/lightdm-webkit2-greeter.c b/src/lightdm-webkit2-greeter.c
index d3232b2..368e01d 100644
--- a/src/lightdm-webkit2-greeter.c
+++ b/src/lightdm-webkit2-greeter.c
@@ -250,15 +250,21 @@ quit_cb(void) {
 	gtk_main_quit();
 }
 
+
 static gchar *
-remove_comments(gchar *str) {
-	gchar *ptr;
+rtrim_comments(gchar *str) {
+	gchar *ptr = NULL;
+
+	ptr = strchr(str, '#');
+
+	if (NULL != ptr) {
+		*ptr = '\0';
+	}
 
-	if (str && (ptr = strchr(str, '#')))
-		*ptr = 0;
 	return g_strstrip(str);
 }
 
+
 int
 main(int argc, char **argv) {
 	GdkScreen *screen;
@@ -272,10 +278,7 @@ main(int argc, char **argv) {
 	GtkCssProvider *css_provider;
 	WebKitCookieManager *cookie_manager;
 
-	/*
-	 * Prevent memory from being swapped out, since we see unencrypted
-	 * passwords.
-	 */
+	/* Prevent memory from being swapped out, since we see unencrypted passwords. */
 	mlockall (MCL_CURRENT | MCL_FUTURE);
 
 	/* Initialize i18n */