Removed useless parameters
changed naming