Refactor, removing optional parameters.