Cleaned up serve()