Refactoring

-Wall -Werror doesn't tolerate unused variable, a comment should be more informative in that case