Runs correctly, formatting and commenting update