Added parameter names into header files
Removed unnecessary parameters