Style Changes

including more transparent names