Cleanup and optimize order service (#7)