code update/cleanup