Cleaning up my mess view 3