Cleaned up checks in execute method and removed unnecessary redirect