Made StyrAvrModule more encapsulated