Cosmetic changes for consistancy. Thanks to wmesser