moved duplicate code into method.
1 file changed