Small code reorganization. Sorry for no big changes.