fix(*): cleanup based on philips's comments