refactoring
Merging, Refactoring, and Minor Fixes