Use Redirect function

We should use the dedicated function for the redirect (adds to the readability etc.)