Mandate proper filename during object creation
Code format cleanup