Cleaned up structure file