Refactoring + added names
Edited page title