Minor cleanup in hero starting position