simplify instructions, simplify detailview code