updated to reflect code cleanup