Cleaned up cleaners.. haha