cleaned structure
added spacing