refactoring..

mooooooorrrreeeee reeeefaaacctooorrrinnnnng