Removed unused imports.
Added missing findTarget() methods.
Less repeated code.