Fix quality flaws.
Fix quality flaws: remove useless paramater and variable.
Fix qualiy flaws.
Reformat code.