Fix comments & File Name Letter Case & Type Casting