Dev

optimize code