Making some improvements on a small client project