Restructuring, reducing the debug information and comment