Basic code cleanup in Client project