Clean up constructors, rename private fields
Fix url building, Clean up constructors, rename private fields,