some formatting and beautification