Documented and cleaned and re-format