Adapted files according to Code Style