formatting and improved quotes controller