Cleaned up model part of Client