Moved parameters to the right file. Almost clean.