Refactored Disk code to remove duplicated and dumb code