Remove URL encode

also Fixed some PSRzzzz