Organize view, clean and comment file