Split code into smaller chunks.
Minor update.