Formatted the code and added missing types to some Nodes