Using Collections#singletonList.
Some cleanup.
Some JavaDoc.
Some JavaDoc.