Fixing more code inconsistencies.
Signed-off-by: RJ garcia <rj@bighead.net>
Fixing code inconsistencies
Signed-off-by: RJ garcia <rj@bighead.net>