Improved formatting added a few methods.