Refactor Node -> Component, cleanup