Style/readability changes