Follow code convention and updated changes.txt