updated for changed whitespace on operators, fixed struct inits