Added filtering of targets.
Formatting.