Cleaned structure and code