minor cosmetic changes / working