Last bit for tonight - some cleanup work