some refactoring with parse classes