no need to encode url and code cleanup