Removed some C-isms