Now the code passes the code convention tool check (#18)

Now the code passes the code convention tool check (#18) #10