:lipstick: Refactored table class