some formatting and better naming