cleaned up structures