Readability improvements IMHO