Beautified code (also included -Wall CPP flag)