Changed: Small cleanup