Cleaning up the implementation
Remove unused parameter
Mid debugging