refactoring with "get-target"

simplifies core/draw and allows us to remove line from core namespace