coding standards
refactoring, pages added