Clean up code

Signed-off-by: Stuart Olivera <stuart@stuartolivera.com>