More changes to make code according to style guidelines