* Update metadata order
Signed-off-by: Tamika Tannis <ttannis@lyft.com>

* Code cleanup
Signed-off-by: Tamika Tannis <ttannis@lyft.com>

* Lint fix
Signed-off-by: Tamika Tannis <ttannis@lyft.com>

* Betterer update
Signed-off-by: Tamika Tannis <ttannis@lyft.com>