Refactor, bump to 1.0.2.