Modified code according to coding guidelines and OXID standards