use single quotes & small code cleanup