used secret instead of cal_name
Removed unused usings
Refactored some stuff