Fixed coding standard and build error