Code cleanup for linuxfr.org peer review ;)