some formatting issues fixed