Refactor, don't want to spend anymore time on it, after 0.1.0 version.