Closes #7 Spacing and syntactical fixes to design