ADD 2014 year to check file compliance
FIX issues raised in code review