Cleaned up structure a bit more