removed class and simplified