Fixed parameter issue
Cleaned configuration