Reworked the cosmetics a bit, tried (and failed) to make it Jboss compatbile