Fixing Improper Class Calls