rename order -> D

remove unnecessary variables