Removed clutter
Added component file