Commented some lines and header