file + code cleanup