Code cleanup and comments on the remains. And yes, I know there's only one function in that class...