Refactored to follow CONTRIBUTING.md, also fixed lowercase-bug stuff