structure names capitalized + minor cleaning