DRYing and making shorter methods
Shorter descriptions
Merge pull request #4 from factor-io/issue_3

closes #3