Refactored and improved the quality of the server components.