Use brickd style, const correctness