Code adjusted for legibility. No changes made.
Updating build.