Clean and bug fix

Fix scores inversion
Prevent from capturing from our own houses
Clean & DRY