More logical variable order

Signed-off-by: ruffenman <jorge@jorgeccapote.com>