Code readability fixes

Applied code style changes per RuboCop.

https://bugzilla.redhat.com/show_bug.cgi?id=1073366