added c99 check, cosmetics