Updating code after cleanup