Clean comments and method names to make clearer.