styling and code cleanup