Improved readability of code

Signed-off-by: Jesse Deppisch <jessedeppisch@gmail.com>