Refactored, merged pull request and renamed farts