killed outcommented code, small optimization