Cleaned up vision code, moved target class