Disk configuration: Minor coding style tweaks & clean-up