small refactoring
models and obj parser