Code Cleanup
Add check for no target of target