Clean up structure allocation to follow best practices.