Add comments. Make some small reorganization.