more simplification
reduce total number of lines