Clean up, less PHP, less echos