Adjust the headers and variables to be alphabetical

Change-Id: I179d17b2413be92f568921c2cd102a1e72895681
Signed-off-by: Alanny Lopez <alannyglopez@gmail.com>
4 files changed