Source commenting and clean-up

Signed-off-by: Stefano Azzolini <stefano.azzolini@caffeinalab.com>