Cleanup: Prevent applying same className multiple times