Redirect code refactoring. Fix Issue #87.