indentation changes
code spring cleaning
model code cleanup