code simplification, fix comment