code cleanup of last commit