Minor:
+ Improve inline documentation for function overloads (parameters are incorrect).
+ Clean up the code.