Removed unnecessary Category tags. Removed Tag property as it usually leads to component abuse. Refactored class format.