Fix code changes based on feedback

Added newlines as needed. Rearranged imports. Rearranged rune
definitions to be alphabetical.