seperate class list; data helper
small fix