Cleaning up leftovers from previous reverted commit.
Codestyle