Adding new shortener api
Update comments
Fix extra space and carriage return