misc changes (refactoring, workflow, design)