Code cleanup

Signed-off-by: David Celis <me@davidcel.is>