Housekeeping. Final formatting of code.