Cleaned up InMemoryServer based on feedback