cleaned views and formatted controller