This commit contains mostly superficial user-facing cleanup, to be followed up with more extensive cleanup and fixes in the API implementation.
Signed-off-by: thelittlefireman <thelittlefireman@users.noreply.github.com>