cleanup on code