added models to admin
clean up code