Reduced scope of commands in tool to single functions.
Improved handling of MaxDiskUsage.