cosmetic updates and working with style before translating to js