code optimization #104