Added formatting and persistence in C#