Reduce LOC, insert some new components