Fixed conflicting class name, code cleanup