Fixed CS
Refactored form