remove new line
Add more formatting