Cleans up cli commands.
Cleans up command files
Additional code cleanup.
Updates README.