Removed C-isms