clean up naming and redundant code
Merge pull request #9 from LouisaBarrett/margin

clean up naming and redundant code