Fix identation error inside format_filename method and change global variable names to CAPS.
Fix identation error inside format_filename method and change global variable names to CAPS.

sukeesh/Jarvis,sukeesh/Jarvis,sukeesh/Jarvis,sukeesh/Jarvis