Removed the ambiguity problem, by adding parenthesis.
Cleaned part of the code.