Fix coding style and remove unneeded command