Cleaned up structure a bit