format cleanup for login area
Merge