Clean up functions a bit
Add echo