Finished code review and modifications
Modified the name of the Apple Component to be generalized