change name, code cleanup