Change comment and align define