Fixed a wrong return in "should_redirect" method and some spring cleaning