cleanup repeating class name and unused variable

@clarete