assorted refactorings
placeholder for system components