Fixed coding style to standards