Fixed compilation error
Applied minor refactoring
Update copyright header