cleanup, updated styles