Remove prepare view

Reformat code