Continuing code cleanup