Organized and cleaned up semantics