further styling and code cleanup