Code clean up; Better README