Make the class parser straightforward
Make the whole parser more clear and consistent