refactored subsystem class to improve clarity and reduce code smell