Repeating code was removed