Updated to reflect new button and field names
Removed old methods
Substituting old calls for new instance method calls
used each_with_object to refactor
Merge pull request #43 from lilkraftwerk/refactorz

Refactorz