Finished readability changes