Changed empty interface Hostile to annotation

Other minor changes