Some styling
fixing merges