code formatting changes..it is getting hard to read this