Cleaned up structure initialization.