update code for readability! getting ready for v0.0.1