improved some formatting