cleaned up nonsense