formatting and some changes to tune this