Refactored var names and string formats to more C#ish