Some formatting changes and added a few more methods.