Some format (#12) & Essentially completed the format.