Revert "Revert "Refactor code to please vogar.""

This reverts commit 12f6650d94641c39a7f33f0046d1af30e04affad.

Change-Id: I7ac220f79d3ecd4f7147159cf834fcf0038e0f16
1 file changed