Split into seperate class and simplified