Fixed comment + code style