Make core file code more human readable
Make code more human readable