Some code adjustments (code standards)