Fixed warning
Fixed defines
Style