Code cleanup

Only minor tweaks...

Thanks for this great project !