Clean up serve example some