Refactoring and adding unit tests for harddrive info.