rearranged page
refactoring, renaming and simplification