clean code, and update to version 0.2.0