[REFACTOR] Clean up indentation in generated code, fix syntax by adding ; to the end of expression lines. Also finish map and item literals for the most part