Refactored the parameter names to be more generic
Removed the return statements