Minor code cleanup
Revert "Minor code cleanup"

This reverts commit 406085362832768b8f747940ee798e4eb0e2e6b8.
Minor code cleanup (reverted last commit because my git user details were all messed up).