Code formatting changes
Replace assertloc with runtime handling
Remove C code