*code cleanup