improve models and cleaned mess