split expression.h file into header and cpp
(trivial) indent