Clean up some struct indentations

Also cleaned up the indentations of some variable declarations.