Code guidelines fixed