Minor fix and cleanup
[BASE-7] Fixing license header check