Update

Further formatting and changes