Minor readability fixes and creation of new classes for server-client architecture