Clean-up and tests for first letter commit.