diff --git a/ws/eclipse/HibIntro/src/main/java/component/address/Address.java b/ws/eclipse/HibIntro/src/main/java/component/address/Address.java
index 7d7a83d3d8ae8e462ced3dd2d6dbf196fa79d68c..00fcda00cec8ea191f35076d909669c24bf2863a 100644
--- a/ws/eclipse/HibIntro/src/main/java/component/address/Address.java
+++ b/ws/eclipse/HibIntro/src/main/java/component/address/Address.java
@@ -5,8 +5,8 @@ import javax.persistence.Embeddable;
 @Embeddable
 public class Address {
 
-	private String street;
-	public String getStreet() { return street;}
+  private String street;
+  public String getStreet() { return street;}
   public void setStreet(String street) { this.street = street;}
 
   private String city;
@@ -16,9 +16,9 @@ public class Address {
   private String zipcode;
   public String getZipcode() { return zipcode;}
   public void setZipcode(String zipcode) { this.zipcode = zipcode;}
-  
+
   protected Address() {}
-  
+
   public Address(final String street, final String city, final String zipcode) {
     setStreet(street);
     setCity(city);
diff --git a/ws/eclipse/HibIntro/src/main/java/component/address/PersistUser.java b/ws/eclipse/HibIntro/src/main/java/component/address/PersistUser.java
index 07996c61671a2d89e7881c88bd4f0c9ffdaf4c51..32a410a7f12386e9f3309b452c642081137f73f3 100644
--- a/ws/eclipse/HibIntro/src/main/java/component/address/PersistUser.java
+++ b/ws/eclipse/HibIntro/src/main/java/component/address/PersistUser.java
@@ -13,12 +13,15 @@ import org.hibernate.cfg.DefaultComponentSafeNamingStrategy;
  *
  */
 public class PersistUser {
-
+  
+  static {
+    HibernateUtil.configuration.setNamingStrategy(new DefaultComponentSafeNamingStrategy());
+  }
    /**
     * @param args not used.
     */
    public static void main(String[] args) {
-     HibernateUtil.configuration.setNamingStrategy(new DefaultComponentSafeNamingStrategy());
+     
       final Session session = HibernateUtil.createSessionFactory("component/address/hibernate.cfg.xml").openSession();
 
       final Transaction transaction = session.beginTransaction();
diff --git a/ws/eclipse/HibIntro/src/main/java/component/email/Email.java b/ws/eclipse/HibIntro/src/main/java/component/email/Email.java
index 9173bba166a6c20a72ac9139b8ec1490baecc3fc..e7e270f50b3110155eca644a143ff994904e1598 100644
--- a/ws/eclipse/HibIntro/src/main/java/component/email/Email.java
+++ b/ws/eclipse/HibIntro/src/main/java/component/email/Email.java
@@ -5,15 +5,15 @@ import javax.persistence.Embeddable;
 @Embeddable
 public class Email {
 
-	private String emailAddress;
-	public String getEmailAddress() { return emailAddress;}
-	public void setEmailAddress(final String emailAddress) { this.emailAddress = emailAddress;}
+  private String emailAddress;
+  public String getEmailAddress() { return emailAddress;}
+  public void setEmailAddress(final String emailAddress) { this.emailAddress = emailAddress;}
 
-	protected Email() {}
-	public Email(final String emailAddress) {
-		setEmailAddress(emailAddress);
-	}
-	void sendEmail(final String subject, final String content) {
-		//Not yet implemented
-	}
-}
+  protected Email() {}
+  public Email(final String emailAddress) {
+    setEmailAddress(emailAddress);
+  }
+  void sendEmail(final String subject, final String content) {
+    //Not yet implemented
+  }
+}
\ No newline at end of file
diff --git a/ws/eclipse/HibIntro/src/main/java/component/email/PersistUser.java b/ws/eclipse/HibIntro/src/main/java/component/email/PersistUser.java
index 299f26b812bb02d84be6799ed14c30124b55fc40..63b6b398f2c2472e3ba31debbeb4d4dbf9950efa 100644
--- a/ws/eclipse/HibIntro/src/main/java/component/email/PersistUser.java
+++ b/ws/eclipse/HibIntro/src/main/java/component/email/PersistUser.java
@@ -19,12 +19,12 @@ public class PersistUser {
    public static void main(String[] args) {
       final Session session = HibernateUtil.createSessionFactory("component/email/hibernate.cfg.xml").openSession();
 
-      final Transaction transaction = session.beginTransaction();
       {
+        final Transaction transaction = session.beginTransaction();
          final User u = new User(123, "goik", "Martin Goik");
          u.setEmailAddress(new Email("goik@hdm-stuttgart.de"));
          session.save(u);
+         transaction.commit();
       }
-      transaction.commit();
    }
 }
\ No newline at end of file