Cleaned up naming
Cleaned up structure