Pass the first argument to numberof separately
Move function definitions to the source file