Changed: code cleanup