Additional changes and clear code.