model: refactoring + spacing