diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 34b223b..3a5d116 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,9 +13,9 @@ Please also:
 
 ## Add/Update/Remove <CompanyName>
 
-- [ ] I have read the [contribution guidelines](../CONTRIBUTING.md)
+- [ ] I have read the [contributing guidelines](../CONTRIBUTING.md)
 - [ ] I agree to the [Code of Conduct](../CODE_OF_CONDUCT.md)
-- [ ] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards#format) prescribed in the readme
+- [ ] I have followed the [format](../CONTRIBUTING.md#format) prescribed in the contributing guidelines
 - [ ] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary
 
 <!--
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a00365a..a3e915e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,26 @@
 # Contributing Guidelines
 
-Thanks for contributing! Please adhere to the [Contributor Code of Conduct](/CODE_OF_CONDUCT.md).
+Thanks for contributing! Please adhere to the [Contributor Code of Conduct](/CODE_OF_CONDUCT.md). Please send a pull request if you have any [additions, updates](#additions-or-updates) or [removals](#removals).
 
-Please send a pull request if you have any [additions, updates](#additions-or-updates) or [removals](#removals). Pull requests will be accepted if:
+## Format
+
+```
+- [Company or team name within company](https://jobspage) | locations | what you do instead
+```
+
+Locations **must** be city names that are separated by a `/`, `;` or `&`. Locations should be formatted like so:
+
+```
+San Francisco, CA; Tokyo, Japan; Moscow, Russia
+```
+
+Good example:
+
+```
+- [MyCompany](https://example.com/jobs) | San Francisco, CA; Tokyo, Japan; Moscow, Russia | Take home project that resembles a problem MyCompany solves for, then discussion about the code in-person
+```
+
+Pull requests will be accepted if they follow the [format](#format) and:
 
 ## Additions or updates
 1. The pull request adheres to the repository's
diff --git a/CRITERIA.md b/CRITERIA.md
index 6052c2f..a2b6db4 100644
--- a/CRITERIA.md
+++ b/CRITERIA.md
@@ -11,7 +11,7 @@ The only exceptions to the above is where CS knowledge is a **requirement** of t
 
 - Instead of using questions that bear no resemblance to the role, adapt the question so that it does. A screening question can be easily adapted so that it applies a "real world" requirement
 - Take-home exercises can be good. Please try to:
-    - time-box them (e.g. under 4 hours)
-    - only allow use of stdlib
-    - pay the candidate for their time
-- Give the candidate options: Some candidates might not have the time necessary to complete a take-home exercise. In those scenarios, allow the candidate to take their laptop in to perform a shorter exercise (e.g. pair program on a small issue)
\ No newline at end of file
+  - time-box them (e.g. under 4 hours)
+  - only allow use of stdlib
+  - pay the candidate for their time
+- Give the candidate options: Some candidates might not have the time necessary to complete a take-home exercise. In those scenarios, allow the candidate to take their laptop in to perform a shorter exercise (e.g. pair program on a small issue)
diff --git a/README.md b/README.md
index 6cef247..1f5b0df 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Hiring without whiteboards
+# Hiring Without Whiteboards
 A listing of companies (or teams within companies) that don't do typical, CS based "whiteboard" interviews. Using sites like [HackerRank](https://www.hackerrank.com) _probably_ fall into that category and won't be accepted. The companies and teams listed here instead use interview techniques and questions that resemble day-to-day work – for example pairing on a real world problem, or a paid/unpaid take home exercise.
 
 ### tl;dr
@@ -9,31 +9,17 @@ A listing of companies (or teams within companies) that don't do typical, CS bas
 
 Please open a PR to be added.
 
-### Format
-
-```
-- [Company or team name within company](https://jobspage) | locations | what you do instead
-```
-
-Locations **must** be city names that are separated by a `/`, `;` or `&`. Locations should be formatted like so:
-
-```
-San Francisco, CA; Tokyo, Japan; Moscow, Russia
-```
-
-Good example:
-
-```
-- [MyCompany](https://example.com/jobs) | San Francisco, CA; Tokyo, Japan; Moscow, Russia | Take home project that resembles a problem MyCompany solves for, then discussion about the code in-person
-```
-
 ### Duds
 
 If you've been through an interview with one of these companies recently, and your experience suggests otherwise from their description, please open a PR to remove them from this list.
 
-### I want to sort by X!
+### I want to sort/filter/group by X!
 
-See the [Airtable](https://airtable.com/shrA3j2eYrVWMBR0N). Additions to this document that are properly formatted will automatically be pushed to a [raw table](https://airtable.com/shrfA5Gs2TQZWGklr). After it is validated (currently manual), it is added to the Airtable. You can see the API [here](https://github.com/poteto/hww-api) (and contribute!)
+- [Alphabetical](https://airtable.com/shr5TdnpVYVTpeRrN/tbluCbToxQ2knSLhh)
+- [Geographical](https://airtable.com/shr31pj5a2GaRf6WY/tbluCbToxQ2knSLhh)
+- [Remote only](https://airtable.com/shr3nTO1nkraVRYY4/tbluCbToxQ2knSLhh)
+
+Additions to this document that are properly formatted will automatically be pushed to a [raw table](https://airtable.com/shrfA5Gs2TQZWGklr). After it is validated (currently manual), it is added to the Airtable. You can see (and contribute!) to the [API here](https://github.com/poteto/hww-api).
 
 ### Discussion