Standardize headers and arg parsing

Change-Id: Ie4d4e0a66003ad7d859d1c86460bc4d281e304e2
Merge "Standardize headers and arg parsing"