Brick People: Optimize performance

Optimize performance