#158 Model cleanup