More cleanup, aiding readability.

Signed-off-by: Gary Pamparà <gpampara@gmail.com>