to do some formatting cleanup and efficiency changes