Suggested changes for the modularize branch