refactored swap_usage and tidy up disk_usage

ok as suggested.