Fix #14: Refactor uriencode/uridecode