Minor changes, begin modularization