(IMPROVE) Implement semi-colons & function scoping