* Updated codestyle compliance (Part 2)