some formatting fixed