refactoring
addressing long lines issue
modified long lines and methods