code clear up

Signed-off-by: Last First <last.first@maxwit.com>