Further code style consistenty adaptions