<develop-2014/2/23-15:19> optimizing code