formatting fixes, excess model/views removed