Clean up the code :-)
Signed-off-by: David <db@d1b.org>