changing variable name and cleanup