Fix some codes to make it prettier for reading.
Update makefile