Removed other arities approach to clean up the code a bit