Code cleanup
Work on 403 error