Addressing code inspection, reformatting most code as well
Global version bump to 0.2.0