Minor style changes; fixed deprecated variable access.