Code cleanup -4