simplify and neaten wiki