Working to fix up style issues