Formatting changes, made separator static

few other optimizations I think