refactoring Methods

New Methods added, Methods extracted, refactoring