diff --git a/lib/eventos/actors/actors.ex b/lib/eventos/actors/actors.ex
index 2d3cadfea..4596d39ca 100644
--- a/lib/eventos/actors/actors.ex
+++ b/lib/eventos/actors/actors.ex
@@ -312,7 +312,7 @@ defmodule Eventos.Actors do
   Get an user by email
   """
   def find_by_email(email) do
-    case Repo.get_by(User, email: email) |> Repo.preload(:actor) do
+    case Repo.preload(Repo.get_by(User, email: email), :actor) do
       nil ->
         {:error, nil}
       user ->
diff --git a/lib/eventos/actors/service/reset_password.ex b/lib/eventos/actors/service/reset_password.ex
index 067f91de6..80e79d7cb 100644
--- a/lib/eventos/actors/service/reset_password.ex
+++ b/lib/eventos/actors/service/reset_password.ex
@@ -12,7 +12,7 @@ defmodule Eventos.Actors.Service.ResetPassword do
   @spec check_reset_password_token(String.t, String.t) :: tuple
   def check_reset_password_token(password, token) do
     with %User{} = user <- Repo.get_by(User, reset_password_token: token) do
-      User.password_reset_changeset(user, %{"password" => password, "reset_password_sent_at" => nil, "reset_password_token" => nil}) |> Repo.update()
+      Repo.update(User.password_reset_changeset(user, %{"password" => password, "reset_password_sent_at" => nil, "reset_password_token" => nil}))
     else
       _err ->
         {:error, :invalid_token}
@@ -25,7 +25,7 @@ defmodule Eventos.Actors.Service.ResetPassword do
   @spec send_password_reset_email(User.t, String.t) :: tuple
   def send_password_reset_email(%User{} = user, locale \\ "en") do
     with :ok <- we_can_send_email(user),
-         {:ok, %User{} = user_updated} <- User.send_password_reset_changeset(user, %{"reset_password_token" => random_string(30), "reset_password_sent_at" => DateTime.utc_now()}) |> Repo.update() do
+         {:ok, %User{} = user_updated} <- Repo.update(User.send_password_reset_changeset(user, %{"reset_password_token" => random_string(30), "reset_password_sent_at" => DateTime.utc_now()})) do
       mail = user_updated
       |> UserEmail.reset_password_email(locale)
       |> Mailer.deliver_later()
@@ -37,7 +37,9 @@ defmodule Eventos.Actors.Service.ResetPassword do
 
   @spec random_string(integer) :: String.t
   defp random_string(length) do
-    :crypto.strong_rand_bytes(length) |> Base.url_encode64
+    length
+    |> :crypto.strong_rand_bytes()
+    |> Base.url_encode64
   end
 
   @spec we_can_send_email(User.t) :: boolean
diff --git a/lib/eventos/actors/user.ex b/lib/eventos/actors/user.ex
index f812319de..d946ddd7f 100644
--- a/lib/eventos/actors/user.ex
+++ b/lib/eventos/actors/user.ex
@@ -66,7 +66,9 @@ defmodule Eventos.Actors.User do
   end
 
   defp random_string(length) do
-    :crypto.strong_rand_bytes(length) |> Base.url_encode64
+    length
+    |> :crypto.strong_rand_bytes()
+    |> Base.url_encode64
   end
 
   @doc """
diff --git a/lib/eventos/email/user.ex b/lib/eventos/email/user.ex
index 7d4ccbcbb..e112e8713 100644
--- a/lib/eventos/email/user.ex
+++ b/lib/eventos/email/user.ex
@@ -1,5 +1,7 @@
 defmodule Eventos.Email.User do
-
+  @moduledoc """
+  Handles emails sent to users
+  """
   alias Eventos.Actors.User
 
   import Bamboo.Email
diff --git a/lib/eventos/mailer.ex b/lib/eventos/mailer.ex
index 253603c05..828430dc1 100644
--- a/lib/eventos/mailer.ex
+++ b/lib/eventos/mailer.ex
@@ -1,3 +1,6 @@
 defmodule Eventos.Mailer do
+  @moduledoc """
+  Mailer
+  """
   use Bamboo.Mailer, otp_app: :eventos
 end
diff --git a/lib/eventos_web/controllers/user_controller.ex b/lib/eventos_web/controllers/user_controller.ex
index 366229b5c..dc7febbc6 100644
--- a/lib/eventos_web/controllers/user_controller.ex
+++ b/lib/eventos_web/controllers/user_controller.ex
@@ -90,7 +90,9 @@ defmodule EventosWeb.UserController do
   end
 
   def show_current_actor(conn, _params) do
-    user = Guardian.Plug.current_resource(conn) |> Repo.preload(:actor)
+    user = conn
+    |> Guardian.Plug.current_resource()
+    |> Repo.preload(:actor)
     render(conn, "show_simple.json", user: user)
   end