Fixed coding style after review