Refactoring

starting some cleanup