Add option to leave out void return type