more refactoring
improvement
Resolves conflicts
Merge branch 'campoy-ide-scsi-sata-support'