Beautify with define. Fixed license errors.