Light refactor to prepare for component identification.
Light refactor to prepare for component identification.

PhilHarnish/forge,PhilHarnish/forge,PhilHarnish/forge,PhilHarnish/forge,PhilHarnish/forge,PhilHarnish/forge