Removed some unnecessary match statements

Simplified some of the complexity I had added in previous work by
replacing some of the unnecessary match statements I had added with
simpler code.

Also, reverted .gitignore to master state since I learned you can have a
global .gitignore.