cleanup
refactoring
made systems singletons