Code clean up
Fixed self disguises, wonder if I introduced new bug.