Cleanup, make use of i8n and also jboss logger