A little bit of code reorganization