structure and formating fixes