Fixed it and cleaned up targeting module