Refactors implementation of droppable targets.
Fixes lint errors.