some formatting and simple improvements