Small code reorganization
1.4.1