Bugs

Minor readability changes