Cleanup and further structure enhancements