diff --git a/jOOQ/src/main/java/org/jooq/Role.java b/jOOQ/src/main/java/org/jooq/Role.java
index 6dad8dc3e5..1425901f56 100644
--- a/jOOQ/src/main/java/org/jooq/Role.java
+++ b/jOOQ/src/main/java/org/jooq/Role.java
@@ -35,14 +35,14 @@
 package org.jooq;
 
 /**
- * The Role to be used by GRANT statement
+ * The Role to be used by GRANT statement.
  *
  * @author Timur Shaidullin
  */
 public interface Role extends QueryPart {
 
     /**
-     * The name of role
+     * The name of the role.
      */
-    public String getName();
+    String getName();
 }
diff --git a/jOOQ/src/main/java/org/jooq/User.java b/jOOQ/src/main/java/org/jooq/User.java
index 2fc2b27611..13ac95859c 100644
--- a/jOOQ/src/main/java/org/jooq/User.java
+++ b/jOOQ/src/main/java/org/jooq/User.java
@@ -35,14 +35,14 @@
 package org.jooq;
 
 /**
- * The User to be used by GRANT statement
+ * The User to be used by GRANT statement.
  *
  * @author Timur Shaidullin
  */
 public interface User extends QueryPart {
 
     /**
-     * The name of user
+     * The name of the user.
      */
-    public String getName();
+    String getName();
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 10bf77f455..634a06c428 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -7875,7 +7875,7 @@ public class DSL {
     }
 
     /**
-     * Create a new role reference
+     * Create a new role reference.
      *
      * @see #role(Name)
      */
@@ -7884,7 +7884,7 @@ public class DSL {
     }
 
     /**
-     * Create a new role reference
+     * Create a new role reference.
      */
     public static Role role(Name name) {
         return new RoleImpl(name);
diff --git a/jOOQ/src/main/java/org/jooq/impl/RoleImpl.java b/jOOQ/src/main/java/org/jooq/impl/RoleImpl.java
index d1165f5d9f..108ec1ca37 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RoleImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RoleImpl.java
@@ -34,16 +34,19 @@
  */
 package org.jooq.impl;
 
-import org.jooq.*;
-
 import static org.jooq.Clause.ROLE;
 
+import org.jooq.Clause;
+import org.jooq.Context;
+import org.jooq.Name;
+import org.jooq.User;
+
 /**
- * A common implementation of the Role type
+ * A common implementation of the Role type.
  *
  * @author Timur Shaidullin
  */
-final class RoleImpl extends AbstractQueryPart implements Role {
+final class RoleImpl extends AbstractQueryPart implements User {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/UserImpl.java b/jOOQ/src/main/java/org/jooq/impl/UserImpl.java
index bbcaed9ec1..a17d800b28 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UserImpl.java
@@ -42,7 +42,7 @@ import org.jooq.Name;
 import org.jooq.User;
 
 /**
- * A common implementation of the User type
+ * A common implementation of the User type.
  *
  * @author Timur Shaidullin
  */