adapted files according to code style