Make view simple and cleaner