cleaned up classe