Modified code according to coding guidelines and OXID standards (cherry picked from commit ece422d)