formating issues fixed