Cleaned up structure a little