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