Code refactoring
Content changes