rename and comment functions and variables