Slight readability update and file size decrease.