Apply changes for readability, making more like a tutorial. NOT finished!!