code cleanup (//)