Comments cleanup.
Refactor + some testing.