cleaning up naming, whitespace, structure.. thanks @ianstormtaylor!
fixing concat in place