Final commit

clean up code

comment code

refactor code