some aesthetic rework