Improved names of variable
Simplify calculating "target"