Build error fixed; code style fixed