Fix some coding style by alansaviolobo

Apply some of #5