update to through2, clean code. 0.3.0