Some basic cleanup

Signed-off-by: Daniel Carbone <daniel.p.carbone@gmail.com>