code readability, model and rest methods improvements