brick expand collapse comment, code clean up