cleaned up details